catch windows installer up with renamed vc redistributable installer. (#667)

diff --git a/gui/setup.iss b/gui/setup.iss
index e41eea576e1b7177ce4164e34fafabbee3a46881..f754da4bcbbad4dda56c87cf31e6a0c85f75ac59 100644 (file)
--- a/gui/setup.iss
+++ b/gui/setup.iss
@@ -47,9 +47,9 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion\r
 Source: qt.conf;                               DestDir: "{app}"; Flags: ignoreversion\r
 \r
-Source: "..\{#gui_build_dir_name}\release\*"; Excludes: "app.res,vcredist_*.exe,*.cpp,*.h,*.o,*.obj"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-Source: "..\{#gui_build_dir_name}\release\vcredist_x86.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
-Source: "..\{#gui_build_dir_name}\release\vcredist_x64.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
+Source: "..\{#gui_build_dir_name}\release\*"; Excludes: "app.res,vc_redist.*.exe,*.cpp,*.h,*.o,*.obj"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs\r
+Source: "..\{#gui_build_dir_name}\release\vc_redist.x86.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
+Source: "..\{#gui_build_dir_name}\release\vc_redist.x64.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
 Source: "..\..\{#gpsbabel_build_dir_name}\release\gpsbabel.exe";       DestDir: "{app}"; Flags: ignoreversion\r
 ; Source: release\help\*;              DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
@@ -76,8 +76,8 @@ Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"
 Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon\r
 \r
 [Run]\r
-Filename: "{app}\vcredist_x86.exe"; Parameters: "/quiet"; Flags: skipifdoesntexist\r
-Filename: "{app}\vcredist_x64.exe"; Parameters: "/quiet"; Flags: skipifdoesntexist\r
+Filename: "{app}\vc_redist.x86.exe"; Parameters: "/quiet"; Flags: skipifdoesntexist\r
+Filename: "{app}\vc_redist.x64.exe"; Parameters: "/quiet"; Flags: skipifdoesntexist\r
 Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent\r
 \r
 [Registry]\r

diff --git a/gui/setup.iss.in b/gui/setup.iss.in
index 28b85489b35ded58367676d0338a6bb603cba431..6a4fdc65b6c03143cab7ec556b0d3958710cce49 100644 (file)
--- a/gui/setup.iss.in
+++ b/gui/setup.iss.in
@@ -47,9 +47,9 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion\r
 Source: qt.conf;                               DestDir: "{app}"; Flags: ignoreversion\r
 \r
-Source: "..\{#gui_build_dir_name}\release\*"; Excludes: "app.res,vcredist_*.exe,*.cpp,*.h,*.o,*.obj"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-Source: "..\{#gui_build_dir_name}\release\vcredist_x86.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
-Source: "..\{#gui_build_dir_name}\release\vcredist_x64.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
+Source: "..\{#gui_build_dir_name}\release\*"; Excludes: "app.res,vc_redist.*.exe,*.cpp,*.h,*.o,*.obj"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs\r
+Source: "..\{#gui_build_dir_name}\release\vc_redist.x86.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
+Source: "..\{#gui_build_dir_name}\release\vc_redist.x64.exe"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
 Source: "..\..\{#gpsbabel_build_dir_name}\release\gpsbabel.exe";       DestDir: "{app}"; Flags: ignoreversion\r
 ; Source: release\help\*;              DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
@@ -76,8 +76,8 @@ Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"
 Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon\r
 \r
 [Run]\r
-Filename: "{app}\vcredist_x86.exe"; Parameters: "/quiet"; Flags: skipifdoesntexist\r
-Filename: "{app}\vcredist_x64.exe"; Parameters: "/quiet"; Flags: skipifdoesntexist\r
+Filename: "{app}\vc_redist.x86.exe"; Parameters: "/quiet"; Flags: skipifdoesntexist\r
+Filename: "{app}\vc_redist.x64.exe"; Parameters: "/quiet"; Flags: skipifdoesntexist\r
 Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent\r
 \r
 [Registry]\r

diff --git a/gui/setup.iss.qmake.in b/gui/setup.iss.qmake.in
index ac1269842288b2cebb6420ff329a323b8f3fe985..27672b86c28b1cdfb19ca0494f806efde47d1787 100644 (file)
--- a/gui/setup.iss.qmake.in
+++ b/gui/setup.iss.qmake.in
@@ -47,9 +47,9 @@ Name: \"desktopicon\"; Description: \"{cm:CreateDesktopIcon}\"; GroupDescription
 Source: gmapbase.html;                         DestDir: \"{app}\"; Flags: ignoreversion\r
 Source: qt.conf;                               DestDir: \"{app}\"; Flags: ignoreversion\r
 \r
-Source: \"..\\{#gui_build_dir_name}\\release\\*\"; Excludes: \"app.res,vcredist_*.exe,*.cpp,*.h,*.o,*.obj\"; DestDir: \"{app}\"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-Source: \"..\\{#gui_build_dir_name}\\release\\vcredist_x86.exe\"; DestDir: \"{app}\"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
-Source: \"..\\{#gui_build_dir_name}\\release\\vcredist_x64.exe\"; DestDir: \"{app}\"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
+Source: \"..\\{#gui_build_dir_name}\\release\\*\"; Excludes: \"app.res,vc_redist.*.exe,*.cpp,*.h,*.o,*.obj\"; DestDir: \"{app}\"; Flags: ignoreversion recursesubdirs createallsubdirs\r
+Source: \"..\\{#gui_build_dir_name}\\release\\vc_redist.x86.exe\"; DestDir: \"{app}\"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
+Source: \"..\\{#gui_build_dir_name}\\release\\vc_redist.x64.exe\"; DestDir: \"{app}\"; Flags: ignoreversion skipifsourcedoesntexist deleteafterinstall\r
 Source: \"..\\..\\{#gpsbabel_build_dir_name}\\release\\gpsbabel.exe\";         DestDir: \"{app}\"; Flags: ignoreversion\r
 ; Source: release\\help\\*;            DestDir: \"{app}\\help\"; Flags: ignoreversion recursesubdirs createallsubdirs\r
 \r
@@ -76,8 +76,8 @@ Name: \"{group}\\GPSBabel\"; Filename: \"{app}\\gpsbabelfe.exe\"
 Name: \"{commondesktop}\\GPSBabel\"; Filename: \"{app}\\gpsbabelfe.exe\"; Tasks: desktopicon\r
 \r
 [Run]\r
-Filename: \"{app}\\vcredist_x86.exe\"; Parameters: \"/quiet\"; Flags: skipifdoesntexist\r
-Filename: \"{app}\\vcredist_x64.exe\"; Parameters: \"/quiet\"; Flags: skipifdoesntexist\r
+Filename: \"{app}\\vc_redist.x86.exe\"; Parameters: \"/quiet\"; Flags: skipifdoesntexist\r
+Filename: \"{app}\\vc_redist.x64.exe\"; Parameters: \"/quiet\"; Flags: skipifdoesntexist\r
 Filename: \"{app}\\gpsbabelfe.exe\"; Description: \"{cm:LaunchProgram,GPSBabelFE}\"; Flags: nowait postinstall skipifsilent\r
 \r
 [Registry]\r